Merge Two Git Repositories And Keep The Master History